final cleanups for refactor
Merge branch 'master' of github.com:chebert/minimal-explore