cleanup
fix typos