Section 7 and 8 is completed

7 Refactoring
8 Deleting Comments