Some C-style changes