haniibrahim Refactoring