Finalize nit-picks on coloring