fix typos and codestyle issues