minor refactoring
another minor refactoring