code improvement on coloring

code cleaning and making coloring more organized for all shapes.
working on the pyramid coloring