some language cleanup