diff --git a/paddlehub/commands/help.py b/paddlehub/commands/help.py
index b0da624335eab5af8524ae88367eef7bb5850963..430f710629a76959a7b9f3fff43f258dad680acb 100644
--- a/paddlehub/commands/help.py
+++ b/paddlehub/commands/help.py
@@ -23,7 +23,7 @@ from paddlehub.commands import register, _commands
 class HelpCommand:
     def execute(self, argv: List) -> bool:
         msg = 'Usage:\n'
-        msg += '\thub <command> <options>\n\n'
+        msg += '    hub <command> <options>\n\n'
         msg += 'Commands:\n'
         for command, detail in _commands['hub'].items():
             if command.startswith('_'):
@@ -31,7 +31,7 @@ class HelpCommand:
 
             if not '_description' in detail:
                 continue
-            msg += '\t{:>15}\t\t{}\n'.format(command, detail['_description'])
+            msg += '    {:<15}        {}\n'.format(command, detail['_description'])
 
         print(msg)
         return True
diff --git a/paddlehub/commands/hub.py b/paddlehub/commands/hub.py
index d4a9471a5760c1db571e058b65bb11b7d283d16c..94bcd7f3cc60520e0b83601aa69012abdec1deae 100644
--- a/paddlehub/commands/hub.py
+++ b/paddlehub/commands/hub.py
@@ -23,5 +23,4 @@ from paddlehub.commands import register, get_command
 class HubCommand:
     def execute(self, argv):
         help = get_command('hub.help')
-        help().execute(argv)
-        return True
+        return help().execute(argv)
diff --git a/paddlehub/commands/utils.py b/paddlehub/commands/utils.py
index 7028673b8c813be595fa6b1eaf3eabd6410553ea..f3775ae25c9487263dd343942b058bf594eef64c 100644
--- a/paddlehub/commands/utils.py
+++ b/paddlehub/commands/utils.py
@@ -32,7 +32,6 @@ def register(name: str, description: str = '') -> Any:
         name(str) : The name of the command, separated by '.' (e.g, hub.serving)
         description(str) : The description of the specified command showd in the help command, if not description given, this command would not be shown in help command. Default is None.
     '''
-
     def _warpper(command):
         items = name.split('.')
 
@@ -66,4 +65,4 @@ def execute():
     else:
         idx += 1
 
-    exit(com['_entry']().execute(sys.argv[idx:]))
+    return com['_entry']().execute(sys.argv[idx:])
diff --git a/paddlehub/server/server.py b/paddlehub/server/server.py
index 6f1b0c29d1e5877ffdc88844caa3354c12964b96..fffdfcfe0a4a8bfc69b83e56fd03695091cb8c81 100644
--- a/paddlehub/server/server.py
+++ b/paddlehub/server/server.py
@@ -22,23 +22,22 @@ PADDLEHUB_PUBLIC_SERVER = 'http://paddlepaddle.org.cn/paddlehub'
 
 class HubServer(object):
     '''PaddleHub server'''
-
     def __init__(self):
         self.sources = OrderedDict()
 
-    def _generate_source(self, url: str):
-        if ServerSource.check(url):
+    def _generate_source(self, url: str, source_type: str = 'server'):
+        if source_type == 'server':
             source = ServerSource(url)
-        elif GitSource.check(url):
+        elif source_type == 'git':
             source = GitSource(url)
         else:
             raise RuntimeError()
         return source
 
-    def add_source(self, url: str, key: str = None):
+    def add_source(self, url: str, key: str = None, source_type: str = 'server'):
         '''Add a module source(GitSource or ServerSource)'''
         key = "source_{}".format(len(self.sources)) if not key else key
-        self.sources[key] = self._generate_source(url)
+        self.sources[key] = self._generate_source(url, source_type)
 
     def remove_source(self, url: str = None, key: str = None):
         '''Remove a module source'''
diff --git a/paddlehub/server/server_source.py b/paddlehub/server/server_source.py
index 64aee1daa774854166be1848b259356f2ce922c3..256c39582a5469bfce8702c40bcee42e795372e4 100644
--- a/paddlehub/server/server_source.py
+++ b/paddlehub/server/server_source.py
@@ -18,8 +18,6 @@ import platform
 import requests
 import sys
 
-import paddle
-
 import paddlehub
 from paddlehub.utils import utils
 
@@ -32,7 +30,6 @@ class ServerSource(object):
         url(str) : Url of the server
         timeout(int) : Request timeout
     '''
-
     def __init__(self, url: str, timeout: int = 10):
         self._url = url
         self._timeout = timeout
@@ -63,6 +60,8 @@ class ServerSource(object):
         if version:
             payload['version'] = version
 
+        # Delay module loading to improve command line speed
+        import paddle
         payload['environments']['hub_version'] = paddlehub.__version__
         payload['environments']['paddle_version'] = paddle.__version__
         payload['environments']['python_version'] = '.'.join(map(str, sys.version_info[0:3]))