Formatting corrections, plus uncomment accidental commenting out in previous commit