more coding standard corrections