Refactoring improving the language
cleanup