Tidy it up for other contribs, still UNFINISHED