minor cleanup of color picker