Minor edits
Organizational refactoring