Typo and cleanup