Kiran | Minor refactoring.