small coding style improvements