Compile error is fixed

Compile error is fixed and some cosmetic update is generated.