MoKeeHelper: code cleanup

Change-Id: I066a0f7e0aa649f7d54e540dd193e058a111c1dd