Significantly simplify reader code