Made refactoring changes