Aravind | Minor refactoring.