Cleanup

This branch cleans some things up.