color updates, code cleanup
color updates, code cleanup