Comment and code cleanup

Code and comment cleanup
changeable server port (not exposed in settings)