Clean up hook a bit