MoKeeHelper: Code Cleanup

Change-Id: Ifc43984ebe1c87effa9374051883b7f72ff820cf