imran|0000|Code Refactor