refactoring / simplifications