Minor tweaks to the layout of the code.