Fixes redundant cast and header style in Baker MM