Some Refactorings