Revert "Code cleanup."

This reverts commit 12906f0922c609cff3e5f397f5d19497e134f743.