diff --git a/aws_console/__init__.py b/aws_console/__init__.py
index 7fd229a..7620573 100644
--- a/aws_console/__init__.py
+++ b/aws_console/__init__.py
@@ -1 +1,16 @@
-__version__ = '0.2.0'
+from .input_output.cli import parse_arguments
+from .input_output.browser import open_console
+
+from .credentials import aws_credentials
+from .aws_console_login import signin_url
+
+__version__ = '0.3'
+
+
+def aws_console():
+    args = parse_arguments()
+
+    creds, region_name = aws_credentials(args)
+    url = signin_url(creds, region_name)
+
+    open_console(url, args)
diff --git a/aws_console/main.py b/aws_console/main.py
deleted file mode 100644
index a91f47d..0000000
--- a/aws_console/main.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from .input_output.cli import parse_arguments
-from .input_output.browser import open_console
-
-from .credentials import aws_credentials
-from .aws_console_login import signin_url
-
-def main():
-    args = parse_arguments()
-
-    creds, region_name = aws_credentials(args)
-    url = signin_url(creds, region_name)
-    
-    open_console(url, args)
-
-if __name__ == '__main__':
-    main()
diff --git a/setup.py b/setup.py
index c77989c..38c6e5e 100755
--- a/setup.py
+++ b/setup.py
@@ -21,13 +21,21 @@ def find_version(*file_paths):
 
 setup(
     name='aws_console',
-    version=find_version("aws_console", "__init__.py"),
+    version=find_version('aws_console', '__init__.py'),
     description='AWS Console Login Utility',
+    keywords = [
+        'aws',
+        'aws-sdk',
+        'aws-cli',
+        'aws-authentication',
+        'aws-sdk-python',
+        'aws-auth'
+    ],
     long_description=read("README.md"),
     packages=find_packages(),
     entry_points={
         'console_scripts': [
-            'aws-console = aws_console.main:main'
+            'aws-console = aws_console:aws_console'
         ]
     },
     install_requires=[
@@ -35,6 +43,7 @@ def find_version(*file_paths):
         'pyperclip>=1.8,<1.9'
     ],
     author='Snigdhajyoti Ghosh',
+    author_email='snigdhajyotighos.h@gmail.com',
     url='https://github.com/snigdhasjg/aws-console',
     license="MIT License",
     classifiers=[
@@ -42,8 +51,8 @@ def find_version(*file_paths):
         'License :: OSI Approved :: MIT License',
         'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
-        'Operating System :: MacOS',
-        'Operating System :: POSIX :: Linux',
-        'Development Status :: 4 - Beta'
+        'Operating System :: OS Independent',
+        'Development Status :: 5 - Production/Stable',
+        'Topic :: Utilities'
     ],
 )