Some minor cleaning up with regards to some shortcuts.