a few proposed cleanups to the very quickly merged pull request

Just a few readability issues & using the java 8 UncheckedIOException, since it seemed appropriate.