Cosmetic changes and fix typos