Minor improvements
Use packaged Java