Minor comment correction and small optimization