diff --git a/src/kitaab-public/build/build.py b/src/kitaab-public/build/build.py
index 549d8e6..1ef3f26 100644
--- a/src/kitaab-public/build/build.py
+++ b/src/kitaab-public/build/build.py
@@ -11,13 +11,11 @@ from datetime import datetime
 import sys
 sys.path.append("./")
 from shared import TagHelper, config
+from . import mistune
 
 # Default encoding
 encoding = 'utf-8'
 
-# Import local files
-mistune = __import__('mistune')
-
 # Activating the renderer
 renderer = mistune.Renderer()
 markdown = mistune.Markdown(renderer=renderer)
diff --git a/src/kitaab-public/main.py b/src/kitaab-public/main.py
index 6fd0a4d..41122a1 100644
--- a/src/kitaab-public/main.py
+++ b/src/kitaab-public/main.py
@@ -1,23 +1,27 @@
 import click
 from grab import makePublic
 from shared import TagHelper
+from build import build
+
 
 @click.command()
 def grab():
-    AllFiles = TagHelper.getAllFiles()
-    FilteredFiles = makePublic.filterFiles(AllFiles)
-    makePublic.copyFiles(FilteredFiles)
+    all_files = TagHelper.getAllFiles()
+    filtered_files = makePublic.filterFiles(all_files)
+    makePublic.copyFiles(filtered_files)
     print("Censoring files...")
     makePublic.censorFiles()
 
+
 @click.command()
-def build():
+def build_website():
     build.generate_website()
 
+
 @click.command()
 def main():
     grab()
-    build()
+    build_website()
 
 
 if __name__ == '__main__':