quick refactoring and additional test