Rationalizing some color stuff, cleaning code, commenting and labelling