Fix up input/output formatting