Formatting and fix typos