Clean up. Fix typos