Cleanup + typo