typo + cleanup