Updated lib/encode: Cosmetics