Cleanup
Typos