Clean up, still working
Fix typo