Second refactor: much better