Gaurav | refactoring done for postquestion