Some fixes to code styling