Clean up Format