Akriti/Sumedha: Did a minor refactoring