Make formatting of commands consistent