minore refactoring
on the way to fix the features-issue