Added port option, cleanup code for pylint