cleanup to make the project match the book text