Polish and fix typos