remove some redundant syntax, fix typos, ...