Cleaning up, Catkinize and Make it work in Hydro