Refactoring to new book 3. Completed half of Iteration F5