Changes to code layout