Refactor last next section