Refactoring and Completed sections