Removing underscores and fixing tense @dgandy