make colors not quite so broken
code cleanup