Folding Shortcuts
make things a bit neater
cleanup