Cleanup
Reorder and clarify Antlr code