B, C Style fixes