Clean up inconsistent wpt data structure
Tackled the ever varying data structure of WPT