Aravind | minor refactoring