Some DRY cleanup