Updating to Java 7 and taking advantage of the new syntax