imran|0000 |code refactoring