more coding standard fixes