Bump to Java 7
Minor cleanup
Minor cleanup