Changed underscore usage to be consistent