Refactoring of some paragraphs, editing, etc.