A tiny optimization and some comment changes