oops, here's the real refactoring!