reformatting and slight changes