additional refactoring