removed some unnecessary color changes