Minor cleaning up of the new read code