Code cleanup.
Code cleanup take 2.
Code cleanup take 3.