Minor: spelling, comment clean-up