Few refactoring changes