reverting the port sucking
code cleanup