Fix up armor enchantments, formatting