Removes TODO fixed in 3fc3bae and minor whitespace cleanup.