Update to be able to parse more fields
Update to scrape an additonal field & tidy code