Refactor let section
Refactor const section