fix for colors
cleanup