Add color and remove un-needed