Better reader code