(MAC) a bit of code cleaning.