[Cleanup] DRY