More use of grid iterator.
Switch to Java 8