Remove underscore where it's not needed