Few refactorings