some more refactoring stuff...