small refactoring
preparation for default/manual behaviour