More cleaning up of Descriptive Variables