Minor tweaks

A couple of tweaks - mostly dealing with spacing inconsistencies.