And more fixes to code style