Cleanup
Refactor: cleanup and inline parse(token)
Removed old shift reduce parser