Minor tidy up of Commands and Application.