Revert "A lot of small changes all jumbled up together."

Reverts Rovanion/SuperHappyFunTime#79