Cleanup and better hook names.