General editorial improvements to code layout