MoKeeSetupWizard: Code Cleanup

Change-Id: Ifa4348ea9024c3eb140357d80eb5ccd2b179988b

backup

Change-Id: Id81ceb61b3bd772924e47f9817971bacd44df482

MoKeeSetupWizard: codecleanup

Change-Id: Ida10e63bcde38964c913ffcb5028fdb56b75db50