Updated sections and refactoring