Remove underscores from variables