[REFACTOR] DRY