Coding style adjustments