Clean up how usage is generated and commands are parsed