Made it pretty

Sorry to be blunt, but no one could read that mess. Given it's a new quarter I thought I'd help you out and make it readable. And don't worry, the tests are passing.

![](http://i.imgur.com/ui3x6an.png)

![](http://i.imgur.com/lz7hOlC.jpg)