Very minor additional refactor