cleanup and color change

green > "orange"