A bit of further tidying.