Clean up code
change back port number