Refactoring
Add the configuration parameter for specify the port number
Fix comments
Fix test cases
Remove last blank line