Cleaning up

- Consolidating hooks
- Removing reduntant hooks
- Prefixing some functions