Support for port from command line arguments
More Code Cleanup