refactoring ... further thinning out