Being picky here, but was this `color` line moved intentionally? If not, it would simplify the change to put it back in the original place.