clean up and fix typos