jdk

3378b66a - Better names, better comments