Reorganized lines by topic and some slight changes