Revert "Code Cleanup"

This reverts commit 7942be05c215adca7542346f0ad5f2ffd811c8ca.
Revert "oo changes"

This reverts commit 0110fe0e4ae5433e07c7e2028b041cbb02438aed.