minor refactoring ;-)