Small MAC cleanup