more coding standards fixes