refactoring some paragraphs