Refactor out generic mbr

I am considering it, but I think it is more readable this way. Also it is less duplicite as it always return `@boot_devices`