Improve readability when adding new command by macro