Corrected few cosmetic issue

Corrected few cosmetic issue