Clean up.

Removed the syntax & semantics stuff, as it was overkill.
Various changes to the class file.
Various stuff