Revert "Classed it up a bit"

This reverts commit cc8081b9e1e28d28c9f4909b37380a3f174e988f.