remove underscore dependency, fix case