Code cleanup / formatting.
Added unit test to make sure the regexes work with tag whitespace.
Additional data added for Mayer table 2.