Minor changes to code layout