#12 Removed InputStreamReader to simplify code