standardize color comments and order