can we fix the comment (i know, nitpicky, but we might as well pick them off one by one)