Shortcuts

Implement shortcuts mentioned in #55 
The first one you mentioned seems clearer to read.