Another quick refactor