Typos & cleanup.