mahendra, mansi | minor refactor