Further fixing of coding style errors