Cleanup/fix typos