fixes to code styling