Ajay | #3718 | Minor refactoring