Small tweaks and a little tidying.