DRY cleanup