refactor coding style