typos & cleanup