minor tweaks in coding style and warning messages