fix coding style
fix some compiler nits