Refactor sections method by decomposition