Clean up and structure for following in the book.