Code refactorings.