Fixed inconsistencies between prior versions and the current approach
Merge pull request #697 from aamcbee/FinalDataStructures

Fixed inconsistencies between prior versions and the current approach