Got rid of unnecessary ReadLine() calls