code refactoring-rachit