use specific JDK version.  code clean up