typo and cleanup