Update port forwarding helper classes
Convert indentation to spaces