beautify and commenting