More const, comment clean-ups