minor refactoring...2