Read fields; slight clean-up