Small refactor for clarity