fix SG for underscores to close #490

also cleanup trailing whitespace
leading -> trailing underscore
Merge pull request #514 from crbates/sgus

fix SG for underscores to close #490