minor refactoring
reshuffling