Cleanup

This cleans up some things that I would do differently today.