Some coding style issue corrected.