Added short params and neatened up some code

This is interim whilst we implement commander.