Cleaned up + added comments Chapter 8