Revert "Code Clean Up"

This reverts commit ea7f8de839e3344a60d00375e9153bedbf2f4494.