strip underscores as well