Revert "Code Cleanup"

This reverts commit b75be73a6dc0467c7f693b7e04d2e97ea412d868.