Revert "Code cleanup."

This reverts commit 5cf9fb408a3b5d44977bfc8676fc3fd848b5cabc.