refactor: trivial reorganization