nettle formatting
upstream changes