Correct format and cleanup.