Minor fixes to code layout