refactoring, getting ready for books