diff --git a/fbchat/__init__.py b/fbchat/__init__.py
index 408b5a0..4a35381 100644
--- a/fbchat/__init__.py
+++ b/fbchat/__init__.py
@@ -8,7 +8,7 @@ Facebook Chat (Messenger) for Python
 from .client import *
 
 
-__version__ = '0.0.1'
+__version__ = '0.0.2'
 __author__ = 'Taehoon Kim'
 __email__ = 'carpedm20@gmail.com'
 __source__ = 'https://github.com/carpedm20/fbchat/'
diff --git a/fbchat/client.py b/fbchat/client.py
index 659ea00..9bee40a 100644
--- a/fbchat/client.py
+++ b/fbchat/client.py
@@ -21,12 +21,6 @@ from .utils import *
 CHROME = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.90 Safari/537.36"
 SAFARI = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_3) AppleWebKit/601.1.10 (KHTML, like Gecko) Version/8.0.5 Safari/601.1.10"
 
-def now():
-    return int(time())
-
-def get_json(text):
-    return json.loads(re.sub(r"for.*(.*;.*;.*).*;", '', text.decode("unicode-escape").encode("utf-8")))
-
 class Client(object):
     """A client for the Facebook Chat (Messenger).
 
diff --git a/fbchat/utils.py b/fbchat/utils.py
index 283ce92..88d677e 100644
--- a/fbchat/utils.py
+++ b/fbchat/utils.py
@@ -1,3 +1,9 @@
+def now():
+    return int(time())
+
+def get_json(text):
+    return json.loads(re.sub(r"for.*(.*;.*;.*).*;", '', text.decode("unicode-escape").encode("utf-8")))
+
 def digit_to_char(digit):
     if digit < 10:
         return str(digit)
@@ -10,3 +16,4 @@ def str_base(number,base):
     if d > 0:
         return str_base(d, base) + digit_to_char(m)
     return digit_to_char(m)
+
diff --git a/setup.py b/setup.py
index 80aafdf..86edeb7 100644
--- a/setup.py
+++ b/setup.py
@@ -17,10 +17,6 @@ with open('README.rst') as f:
     readme_content = f.read().strip()
 
 
-with open('LICENSE.txt') as f:
-    license_content = f.read().strip()
-
-
 version = None
 author = None
 email = None
@@ -42,8 +38,12 @@ setup(
     name='fbchat',
     author=author,
     author_email=email,
+    license='BSD License',
+    keywords=["facebook chat fbchat"],
+    description="Facebook Chat (Messenger) for Python",
+    long_description=readme_content,
     classifiers=[
-        'Development Status :: 1 - Planning',
+        'Development Status :: 2 - Pre-Alpha',
         'Intended Audience :: Developers',
         'Intended Audience :: Developers',
         'Intended Audience :: Information Technology',
@@ -60,15 +60,11 @@ setup(
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Programming Language :: Python',
-        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
-        'Topic :: Multimedia :: Graphics :: Presentation',
         'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+        'Topic :: Communications :: Chat',
     ],
-    description="Facebook Chat (Messenger) for Python",
-    keywords=["facebook chat fbchat"],
     include_package_data=True,
-    license=license_content,
-    long_description=readme_content,
     packages=['fbchat'],
     install_requires=[
         'requests',