Nit: align comments, collapse onto single line.