Revert "Cleaned up the code a bit"

This reverts commit 3db93270bb43ad150480bcbce4f963eac8028440.