Some sensible edits