sandesh,mahendra | refactoring