Lay a clue, tidy up some