switch some to C90