Few refactoring.