Fix typo, cleanup