Cleans up some non-idiomatic java.
Merge pull request #1 from 8thlight/cleanup

Cleans up some non-idiomatic java.