Add some shortcuts and cleanup