Fix coding style issues pointed by Bill.