Format and add comments