beautify comment template
change to async pattern