Minor tweaks in coding style