Cleaned Chapter 5 and half Chapter 6