Refactoring / simplification