Improve formatting of commands