remove misleading and unnecessary underscores