Small coding style adjustments