minor refactoring...