Tidy up to first pass.