Remove redundant code.
Tweak formatting.