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