MoKeeHelper: Code Cleanup

Change-Id: I9464f360a3a196324db193f50d715b3cf4af2250