[Garima] refactored the code]