Update / Repair hook managment
Misc cleanup
Formatting/Cleanup