MHAPI clean up part two (clean and working but NOT DONE yet)