Revert "I made a few pointless changes here. Cool."

This reverts commit da0a2e1771821357a78e2b567cda7f021b754164.