Final tweaks from tidy up.