Fix misordered comments, also clean up comments somewhat