beautify and add comment