Removed references to underscore