refactoring: removed beneficiary hardcoding