Refactoring, cleanup, and upgrade to 0.7.1