Whitespace cleanup
Add the rest of the Java Pattern grammar