Some minor cleanup of color handling