Refactor section order