renamed classes, extract readDataLine method