DRY improvements