Revert "Code cleanup."

This reverts commit 3e5200c2d7ba1f8dea4c41501652927082ba0a55.