Wordset validation error message working. And cleanup