Tidy up commands and make them consistent