Small refactor to make sense