Made some of the Bloomery validation code better