canoncommands -> commands and tightened whitespace