Typo + simplifications