language cleanup second try ;)