Minor corrections to code layout