MoKeeHelper: Code CleanUp

Change-Id: I9d358704bea1742ff9b90d4966fa3726b2cc106b