fix typo and code convention