Refactorings made.