- Some Refactorings.