minor regular refactoring