Other small coding style improvements