Correct format and comment