* Make use of shared pointers to pass objects,
* Make parser class compile,
* Removal of unnecessary class Data,
* Minor consistency fixes.