Slight tidy-up.
Originally intended to alter to the Similarity class itself;
but that did not work terribly well, and it was taking a little too long.