Revert "Cleaned up some code"

This reverts commit d84556c5ff0125b4b32f1f6216afe5b19782aa8d.