Refactoring, and a bit faster and more obvious what's happening.