Cleanup. Removed some dead code. Make some things a little prettier.
Also Fools now allows blank lines.