Slight code cleanup, and added the CS coloring method