Spelling, whitespace creep, indentation; per code review comments