Clean up some poor language choices