minor refactor of coding style