cstyle cleanup