Aravind | minor refactoring.