Tidy up MB accounting