diff --git a/src/diana/config.py b/src/diana/config.py
--- a/src/diana/config.py
+++ b/src/diana/config.py
@@ -2,10 +2,10 @@ import os
 from argparse import ArgumentParser
 
 
-progName = "DianaXO"
-version = (0, 1, 0)
+PROG_NAME = "DianaXO"
+VERSION = (0, 1, 0)
 
-curDir = os.path.dirname(__file__)
+cur_dir = os.path.dirname(__file__)
 
 parser = ArgumentParser()
 parser.add_argument("--encoding")
@@ -17,34 +17,34 @@ parser.add_argument("--format", choices=
 parser.add_argument("-k", "--keep-broken")
 parser.add_argument("--moves-p-d", type=int)
 parser.add_argument("--min-p-d", type=int)
-parser.add_argument("--version", action="version", version="{0} {1}.{2}.{3}".format(progName, *version))
+parser.add_argument("--version", action="version", version="{0} {1}.{2}.{3}".format(PROG_NAME, *VERSION))
 
 
-inputFiles = []
+input_files = []
 encoding = "utf-8-sig"
-sgfSuffix = True
+sgf_suffix = True
 recursive = False
-outputDir = curDir
-outputFormat = "svg"
-keepBroken = False
+output_dir = cur_dir
+output_format = "svg"
+keep_broken = False
 
-movesPerDiagram = 100
-minMovesPerDiagram = 10
+moves_per_diagram = 100
+min_moves_per_diagram = 10
 
 
-def parseArgs():
-	global inputFiles, encoding, sgfSuffix, recursive, outputDir, outputFormat, keepBroken, movesPerDiagram
-	global minMovesPerDiagram
+def parse_args():
+	global input_files, encoding, sgf_suffix, recursive, output_dir, output_format, keep_broken, moves_per_diagram
+	global min_moves_per_diagram
 
-	args=parser.parse_args()
+	args = parser.parse_args()
 
-	inputFiles=args.input
+	input_files = args.input
 	if args.encoding: encoding = args.encoding
-	if args.suffix: sgfSuffix = True
+	if args.suffix: sgf_suffix = True
 	if args.recursive: recursive = True
-	if args.output: outputDir = args.output
-	if args.format: outputFormat = args.format
-	if args.keep_broken is not None: keepBroken = True
+	if args.output: output_dir = args.output
+	if args.format: output_format = args.format
+	if args.keep_broken is not None: keep_broken = True
 
-	if args.moves_p_d: movesPerDiagram = args.moves_p_d
-	if args.min_p_d: minMovesPerDiagram = args.min_p_d
+	if args.moves_p_d: moves_per_diagram = args.moves_p_d
+	if args.min_p_d: min_moves_per_diagram = args.min_p_d