ENH @glouppe comments + small optimization