Fixes to code style