Minor cleanup
Started working on Java parser. Does not compile yet.