DG:
DG: Refactoring / simplification