Refactor section 1.