Cleanup colors and generally neaten