libstyle cleanup