Minor fixes to code format