Ajay/Pooja | Minor refactoring