Fix Output Format