Fix typo + small optimization