Cleansing the code and minor bug fixes
Refactoring of the CST/parser to be more object oriented