Tiding up a bit