cleaning up coloring logic