[Naresh/Aasawaree] : Refactored the code