Make some of the command line stuff a bit less scary