Whitespace tidy
Renaming commands