Make the command line a little less painful