Cleanup and #10 changes.