Again small refactoring ...