fix SG for underscores to close #490

also cleanup trailing whitespace
Shouldn't this be "with a trailing underscore"?