Refactor section 2