typo && cleanup