Tidying up the command parsing, preparation for the command argument parser