diff --git a/src/morevna.py b/src/morevna.py
--- a/src/morevna.py
+++ b/src/morevna.py
@@ -3,7 +3,7 @@ import os.path
 import logging as log
 from argparse import ArgumentParser
 
-from util import spawnDaemon, splitHost
+from util import spawn_daemon, split_host
 import config as conf
 import stats
 from hashtree import HashTree
@@ -11,42 +11,42 @@ from client import Client, Connection as
 from server import Miniserver
 
 
-def _checkFile(f):
+def _check_file(f):
 	if not os.path.isfile(f):
 		print("invalid file specified:", f, file=sys.stderr)
 		sys.exit(1)
 
 
-def buildTree(args):
-	_checkFile(args.datafile)
+def build_tree(args):
+	_check_file(args.datafile)
 	if os.path.isfile(args.treefile):
-		treeMod = os.stat(args.treefile).st_mtime
-		dataMod = os.stat(args.datafile).st_mtime
-		if dataMod<treeMod and not args.force:
+		tree_mod = os.stat(args.treefile).st_mtime
+		data_mod = os.stat(args.datafile).st_mtime
+		if data_mod<tree_mod and not args.force:
 			print("tree file is up to date")
 			return
 
-	tree = HashTree.fromFile(args.datafile)
+	tree = HashTree.from_file(args.datafile)
 	tree.save(args.treefile)
 
 
 def push(args):
-	_checkFile(args.datafile)
+	_check_file(args.datafile)
 	if args.tree:
-		_checkFile(args.tree)
+		_check_file(args.tree)
 	if args.host: conf.hosts = [args.host]
 	if args.port: conf.port = args.port
 
-	c = Client(args.datafile,args.tree)
+	c = Client(args.datafile, args.tree)
 	for h in conf.hosts:
-		host = splitHost(h,conf.port)
+		host = split_host(h, conf.port)
 		stats.reset()
 		try:
 			with ClientConnection(*host) as con:
-				c.setConnection(con)
+				c.set_connection(con)
 				c.init("push")
-				blocksToTransfer = c.negotiate()
-				c.sendData(blocksToTransfer)
+				blocks_to_transfer = c.negotiate()
+				c.send_data(blocks_to_transfer)
 			print()
 			print(stats.report())
 			print()
@@ -56,21 +56,22 @@ def push(args):
 			print(e)
 		except IncompatibleException as e: print(e)
 
+
 def pull(args):
-	_checkFile(args.datafile)
+	_check_file(args.datafile)
 	if args.tree:
-		_checkFile(args.tree)
+		_check_file(args.tree)
 	if args.host: conf.hosts = [args.host]
 	if args.port: conf.port = args.port
 
 	c = Client(args.datafile, args.tree)
-	host = splitHost(conf.hosts[0], conf.port)
+	host = split_host(conf.hosts[0], conf.port)
 	try:
 		with ClientConnection(*host) as con:
-			c.setConnection(con)
+			c.set_connection(con)
 			c.init("pull")
-			blocksToTransfer = c.negotiate()
-			c.pullData(blocksToTransfer, args.force)
+			blocks_to_transfer = c.negotiate()
+			c.pull_data(blocks_to_transfer, args.force)
 		print()
 		print(stats.report())
 	except FailedConnection: pass
@@ -80,15 +81,15 @@ def pull(args):
 
 
 def serve(args):
-	_checkFile(args.datafile)
+	_check_file(args.datafile)
 	if args.tree:
-		_checkFile(args.tree)
+		_check_file(args.tree)
 	if args.host: conf.hosts.insert(0, args.host)
 	if args.port: conf.port = args.port
 
 	try:
-		s = Miniserver(args.datafile,args.tree)
-		spawnDaemon(s.serve)
+		s = Miniserver(args.datafile, args.tree)
+		spawn_daemon(s.serve)
 	except Exception as e:
 		log.exception("exception: %s", e)
 		print("Failed to start:\n  ", e)
@@ -97,33 +98,33 @@ def serve(args):
 parser = ArgumentParser()
 subparsers = parser.add_subparsers()
 
-pBuild = subparsers.add_parser("build")
-pBuild.add_argument("-f", "--force", action="store_true", help="force tree rebuild")
-pBuild.add_argument("treefile", help="stored hash tree location")
-pBuild.add_argument("datafile")
-pBuild.set_defaults(func=buildTree)
+p_build = subparsers.add_parser("build")
+p_build.add_argument("-f", "--force", action="store_true", help="force tree rebuild")
+p_build.add_argument("treefile", help="stored hash tree location")
+p_build.add_argument("datafile")
+p_build.set_defaults(func=build_tree)
 
-pUpdate = subparsers.add_parser("push")
-pUpdate.add_argument("-p", "--port", type=int)
-pUpdate.add_argument("--host")
-pUpdate.add_argument("-t", "--tree", help="stored hash tree location")
-pUpdate.add_argument("datafile")
-pUpdate.set_defaults(func=push)
+p_update = subparsers.add_parser("push")
+p_update.add_argument("-p", "--port", type=int)
+p_update.add_argument("--host")
+p_update.add_argument("-t", "--tree", help="stored hash tree location")
+p_update.add_argument("datafile")
+p_update.set_defaults(func=push)
 
-pUpdate = subparsers.add_parser("pull")
-pUpdate.add_argument("-p", "--port", type=int)
-pUpdate.add_argument("--host")
-pUpdate.add_argument("-t", "--tree", help="stored hash tree location")
-pUpdate.add_argument("-f", "--force", action="store_true", help="ignore lock file")
-pUpdate.add_argument("datafile")
-pUpdate.set_defaults(func=pull)
+p_update = subparsers.add_parser("pull")
+p_update.add_argument("-p", "--port", type=int)
+p_update.add_argument("--host")
+p_update.add_argument("-t", "--tree", help="stored hash tree location")
+p_update.add_argument("-f", "--force", action="store_true", help="ignore lock file")
+p_update.add_argument("datafile")
+p_update.set_defaults(func=pull)
 
-pServe = subparsers.add_parser("serve")
-pServe.add_argument("-p", "--port", type=int)
-pServe.add_argument("--host")
-pServe.add_argument("-t", "--tree", help="stored hash tree location")
-pServe.add_argument("datafile")
-pServe.set_defaults(func=serve)
+p_serve = subparsers.add_parser("serve")
+p_serve.add_argument("-p", "--port", type=int)
+p_serve.add_argument("--host")
+p_serve.add_argument("-t", "--tree", help="stored hash tree location")
+p_serve.add_argument("datafile")
+p_serve.set_defaults(func=serve)
 
 args = parser.parse_args()
 try: args.func(args)