Revert "Cleaned things up a bit."

This reverts commit 2a6a4fd9294e0528f81f238df67d113a45e4e6a4.