Cleanup tokenizing
Add code generation