Refactor out generic mbr

yes, make sense. I think maybe shorter log can be also useful