Some minor comment simplifcation.