Clean up code and color change