color work
color work + cleanup