add colors
clean up