Further changes in coding style