Mansi, Mahendra | #580 | refactoring; moving approval logic to a helper class"