some more goodies (refactoring)