clean up some comments and accidentally introduced whitespace changes