Add some shortcuts and nicer formatting