Lesson 5 cleanup
Lesson 6 cleanup
Lesson 7 cleanup
Lesson 8 cleanup