Simplify dorothy-state conditional logic
Clean up whitespace, spelling, trailing parens
meged tidyup
Merge branch 'danielcompton-tidy-up'
updated version for new release