1 optimization, 2 more accurate comments