Ajay | #0000 | Minor refactorings