Added a MetaData model refactored data look ups, added unit testing
Removed whitespace
Fixed typos