Fixed format -> output_format everywhere