Looks to me like most of the refactoring in this file was just moving things around, which is great.