Refactor out generic mbr

yes, but ruby do not complain :)