More Refactoring!