Correct typo
More cleanup