Small refactor opportunity