Few refactorings.