#12: Better comments layout
#12: Save the comments.