update colors and clean code