Fixes to code formatting