Commit changes from Exercise Chapter 6