update sampling state checks to new data
update sampling state checks to new data

plus cosmetic style changes

agoldst/dfrtopics,agoldst/dfrtopics,joncgoodwin/dfrtopics,joncgoodwin/dfrtopics,agoldst/dfrtopics,joncgoodwin/dfrtopics,agoldst/dfrtopics,agoldst/dfrtopics