Clean-up

* Clean up scripts for consistency
* Add hooks for shell specific key-bindings