Revert "Code Cleanup"

This reverts commit 02ce0456c8728f730a20c905dfae351596472a0c.