Clean up read-generator a little