Fantastic refactoring. Awesome job figuring that out!