Woah, that's a really great refactoring. Thanks!