Clean syntax.
Cleanup, add test runner.
Normalize
Fixes generator- still needs cleanup