Refactor out generic mbr

no, just result of refactoring as original statement was much longer