cleaning code + changing colors