Clean up language a bit