reorganize the changes to the code; clean up some of the text
reorganize the changes to the code; clean up some of the text

jrha/pan,jrha/pan,quattor/pan,jrha/pan,jrha/pan,quattor/pan,jrha/pan,quattor/pan,quattor/pan,quattor/pan