beautify indentation
beautify indentation + cleaning up
Merge branch 'hydro_dev' into velocity_interface_controller