Nice cleanup! Question is if it makes sense to have a configurable buffer size for the BufferedReader.