Refactored to load html tables into lists and dictionaries