Increased commenting and grouping of commands