Lots of editing on cleaning and reading