jdk

79d8c146 - implement suggested changes from @chhagedorn's review