Revert "Cleaned up code"

This reverts commit f9fbf99ec3e4e3b5bbc073d2353080d5063854c8.