reorganized content, removed duplication