Cleaned Code up
Revert "Cleaned Code up"

This reverts commit 10d9031c8c9e9e67bf70bec6236722954f57a6dd.
Revert "Revert "Cleaned Code up""

This reverts commit b3386d9ac3f54d67580e8dfdf7d5904c00226d56.