Some code style issue corrected.