Minor edits again

Some Java 7 changes, raw types and formatting.