Updated lib/decode: Cosmetics