diff --git a/README.md b/README.md
index 4f2e55c..083b7a6 100644
--- a/README.md
+++ b/README.md
@@ -242,7 +242,7 @@ downloaded there if you don't specify otherwise.
 
 Be sure that the Python install path is added to the PATH system environment
 variables. This can be found in Control Panel > System > Advanced System
-Settings > Environment Variables. 
+Settings > Environment Variables.
 
 ```
 Example:
@@ -409,7 +409,7 @@ one of the following actions solve your problem:
     * You get an error when using `-n` to specify that you want to use a
       `.netrc` file and,
     * You want the script to use your default netrc file and,
-    * You get a message saying `coursera-dl: error: too few arguments`  
+    * You get a message saying `coursera-dl: error: too few arguments`
 
       Then you should specify `--` as an argument after `-n`, that is, `-n --`
       or change the order in which you pass the arguments to the script, so that
@@ -539,7 +539,7 @@ https://urllib3.readthedocs.io/en/latest/security.html#insecureplatformwarning
 When saving a course page, we enabled `MathJax` rendering for math equations, by
 injecting `MathJax.js` in the header. The script is using a cdn service provided
 by [mathjax.org](https://cdn.mathjax.org/mathjax/latest/MathJax.js). However, that
-url is not accessible in some countries/regions, you can provide a 
+url is not accessible in some countries/regions, you can provide a
 `--mathjax-cdn <MATHJAX_CDN>` parameter to specify the `MathJax.js` file that is
 accessible in your region.
 
diff --git a/coursera/commandline.py b/coursera/commandline.py
index 2ea69b1..bb17504 100644
--- a/coursera/commandline.py
+++ b/coursera/commandline.py
@@ -112,7 +112,8 @@ def parse_args(args=None):
                              )
 
     # Selection of material to download
-    group_material = parser.add_argument_group('Selection of material to download')
+    group_material = parser.add_argument_group(
+        'Selection of material to download')
 
     group_material.add_argument('--only-syllabus',
                                 dest='only_syllabus',
@@ -289,7 +290,8 @@ def parse_args(args=None):
                         help='Do not limit filenames to be ASCII-only')
 
     # Advanced authentication
-    group_adv_auth = parser.add_argument_group('Advanced authentication options')
+    group_adv_auth = parser.add_argument_group(
+        'Advanced authentication options')
 
     group_adv_auth.add_argument('-c',
                                 '--cookies_file',
@@ -323,7 +325,8 @@ def parse_args(args=None):
                                 help='clear cached cookies')
 
     # Advanced miscellaneous options
-    group_adv_misc = parser.add_argument_group('Advanced miscellaneous options')
+    group_adv_misc = parser.add_argument_group(
+        'Advanced miscellaneous options')
 
     group_adv_misc.add_argument('--hook',
                                 dest='hooks',
@@ -416,7 +419,8 @@ def parse_args(args=None):
 
     # check arguments
     if args.use_keyring and args.password:
-        logging.warning('--keyring and --password cannot be specified together')
+        logging.warning(
+            '--keyring and --password cannot be specified together')
         args.use_keyring = False
 
     if args.use_keyring and not keyring:
@@ -437,5 +441,3 @@ def parse_args(args=None):
             sys.exit(1)
 
     return args
-
-