Task/fix typos and whitespace