|#27|Megha| refactored code