yekhorde refactoring kardam
refactoring