Sowmya & Kiran | #811 | Refactored code