Improve DRY