clean-up. !!! Renaming funtions and function calls !!!
clean-up. !!! Renaming funtions and function calls !!!