Small coding style improvements