Adding automatic setting of hostnames if one isnt specified and cleaning up port formatting
Cleanup