Typo & cleanup