Updated colors
Code cleanup