Style fix and comment clean-up.