Cleanup and fix typos