Did Even More Refactoring.