Clearning up and adding module for chapter 2