minor organization refactoring