MHAPI code review update