More Refactorings