Cleanup

This addresses most of the review comments in #1 and more.