More adjustments in coding style