Clues are now available. Code tidy.