cleanup code and changed port