Merge pull request #118 from ipa-fxm/hydro_dev

Beautify and cleanup