readablity cleanup
fix port names