a few more fixes for style issue