Typo + cleanup