Cleanup

* General cleanup on the sloppy code.