Refactor to sections