Improve commands snippets.