Some more tidy up and fix a small issue with the List of Words rule