reformatting and reshuffling some of the comments
reformatting and reshuffling some of the comments