Corrected formatting and encoding