Better indentation and fix typos