MoKeeHelper: code cleanup

Change-Id: Iaacb5e7ceff21fec03ff221d786a6f86fa16c9d2