Refactor out generic mbr

Any reason for splitting the condition to two lines? This should fit single line...