Refactorings done.