Minor fixes of coding style