Refactored out old file/stream reading code and replaced with Google Guava.