Add in underscore and a few comments