Revert "Code Cleanup"

This reverts commit e460b1e4b00ca0f6198a00de59aae943d7dc7198.