more fixes to code style