Small coding style changes