Clean up and fix typos