Clean up the ColorSearch code