remove underscore-ism