Added more underscore removal