Cleanup and fix some typos