Mahendra,Mansi |#45, refactoring