diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index 15a4414c..e5d03572 100644
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -130,7 +130,7 @@ def main():
     projecttype = None
     issuetracker = None
     license = None
-    website = url #by default, we might override it
+    website = url  # by default, we might override it
     if url.startswith('git://'):
         projecttype = 'git'
         repo = url
diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index b0ca3faa..235a6a82 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -61,7 +61,7 @@ def disable_in_config(key, value):
 def genpassword():
     '''generate a random password for when generating keys'''
     h = hashlib.sha256()
-    h.update(os.urandom(16)) # salt
+    h.update(os.urandom(16))  # salt
     h.update(bytes(socket.getfqdn()))
     return h.digest().encode('base64').strip()
 
@@ -213,7 +213,7 @@ def main():
     if options.distinguished_name:
         keydname = options.distinguished_name
         write_to_config('keydname', keydname)
-    if keystore == 'NONE': # we're using a smartcard
+    if keystore == 'NONE':  # we're using a smartcard
         write_to_config('repo_keyalias', '1')  # seems to be the default
         disable_in_config('keypass', 'never used with smartcard')
         write_to_config('smartcardoptions',
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 116f6e28..cd44cbc1 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -335,7 +335,7 @@ class DescriptionFormatter:
                 self.text_html += '<ol>'
                 self.state = self.stOL
             self.text_html += '<li>'
-            self.text_plain += '* ' #TODO: lazy - put the numbers in!
+            self.text_plain += '* '  # TODO: lazy - put the numbers in!
             self.addtext(line[1:])
             self.text_html += '</li>'
         else: