Further tidies