Cstyle fixes