some more coding style corrections