diff --git a/src/diana/drawer/base.py b/src/diana/drawer/base.py
--- a/src/diana/drawer/base.py
+++ b/src/diana/drawer/base.py
@@ -16,31 +16,31 @@ class DiagramPoint:
 
 
 class Base:
-	highNumbers = True
+	high_numbers = True
 
 	def __init__(self, start=0):
 		self.overlays = []
 		self._letter = "a"
 
 		self._index = dict()
-		self._indexGen = count(start)
+		self._index_gen = count(start)
 
-		curDir = os.path.dirname(__file__)
-		templateDir = os.path.join(curDir, "..", "templ")
-		self._env = Environment(loader=FileSystemLoader(templateDir))
+		cur_dir = os.path.dirname(__file__)
+		template_dir = os.path.join(cur_dir, "..", "templ")
+		self._env = Environment(loader=FileSystemLoader(template_dir))
 		self._env.trim_blocks = True
 		self._env.lstrip_blocks = True
 
-	def addStone(self, x, y, color):
+	def add_stone(self, x, y, color):
 		assert (x, y) not in self._index
-		self._index[(x, y)] = (next(self._indexGen), DiagramPoint(x, y, color))
+		self._index[(x, y)] = (next(self._index_gen), DiagramPoint(x, y, color))
 
-	def addMove(self, x, y, color, label):
-		if (not self.highNumbers) and isinstance(label, int) and label%100 != 0:
+	def add_move(self, x, y, color, label):
+		if (not self.high_numbers) and isinstance(label, int) and label%100 != 0:
 			label %= 100
 
 		if (x, y) not in self._index:
-			self._index[(x, y)] = (next(self._indexGen), DiagramPoint(x, y, color, label))
+			self._index[(x, y)] = (next(self._index_gen), DiagramPoint(x, y, color, label))
 		else:
 			(_, point) = self._index[(x, y)]
 			if not point.label:
@@ -48,10 +48,10 @@ class Base:
 				self._letter = chr(ord(self._letter)+1)
 			self.overlays.append((label, point.label))
 
-	def addLabel(self, x, y, label):
-		self._index[(x, y)] = (next(self._indexGen), DiagramPoint(x, y, "", label))
+	def add_label(self, x, y, label):
+		self._index[(x, y)] = (next(self._index_gen), DiagramPoint(x, y, "", label))
 
 	def save(self, filename):
-		notes=open(filename+".txt", 'w')
+		notes = open(filename+".txt", 'w')
 		notes.write("\n".join("{0} = {1}".format(a, b) for (a, b) in self.overlays))
 		notes.close()