Performed refactorings.