update coding style in a few places