Refactor hook storage
Clean up / shorten hooks