MoKeeHelper: code cleanup

Change-Id: Id0c54bef2edc4c179edc46d9c2296af799b25a22