Clean up a couple of Color methods. Few other very minor changes