Revert "Code cleanup."

This reverts commit d8b69acfc559f25b3bcecacac0fc9410a6dab728.
Code cleanup.