COMMANDBOX-43 Comments and whitespace