More Refactoring.