some more coding standard changes