MoKeeHelper: code cleanup

Change-Id: Ie13bf21818cb048947adcad9974ceeabd97d0f42