Fixed some colors and cleaned some of the code