diff --git a/jrnl/Journal.py b/jrnl/Journal.py
index 49623171..12e638ec 100644
--- a/jrnl/Journal.py
+++ b/jrnl/Journal.py
@@ -12,7 +12,7 @@ import re
 from datetime import datetime
 import logging
 
-log = logging.getLogger("jrnl")
+log = logging.getLogger(__name__)
 
 
 class Journal(object):
diff --git a/jrnl/cli.py b/jrnl/cli.py
index e0663e8e..0fd91371 100644
--- a/jrnl/cli.py
+++ b/jrnl/cli.py
@@ -18,7 +18,7 @@ import argparse
 import sys
 import logging
 
-log = logging.getLogger("jrnl")
+log = logging.getLogger(__name__)
 
 
 def parse_args(args=None):
diff --git a/setup.py b/setup.py
index 1134744d..a4a0488b 100644
--- a/setup.py
+++ b/setup.py
@@ -75,11 +75,11 @@ conditional_dependencies = {
 
 
 setup(
-    name = "jrnl",
-    version = get_version(),
-    description = "A command line journal application that stores your journal in a plain text file",
-    packages = ['jrnl'],
-    install_requires = [
+    name="jrnl",
+    version=get_version(),
+    description="A command line journal application that stores your journal in a plain text file",
+    packages=['jrnl'],
+    install_requires=[
         "pyxdg>=0.19",
         "parsedatetime>=1.2",
         "pytz>=2013b",
@@ -112,9 +112,9 @@ setup(
         'Topic :: Text Processing'
     ],
     # metadata for upload to PyPI
-    author = "Manuel Ebert",
-    author_email = "manuel@1450.me",
+    author="Manuel Ebert",
+    author_email="manuel@1450.me",
     license="LICENSE",
-    keywords = "journal todo todo.txt jrnl".split(),
-    url = "http://www.jrnl.sh",
+    keywords="journal todo todo.txt jrnl".split(),
+    url="http://www.jrnl.sh",
 )