Removed deprecated orig_port variable
Cosmetics: Removed verbose comment and fixed formatting