Fix typo and clear mess