More cleanup, more work on #10