Pooja | #3582 | Minor Refactoring