names & objects separate sections
clean up
updates
another refactor