Hooks

- Code cleanup.