Make the language class better