Sandesh,Aravind | #53 | minor refactoring.