cleaned variable and function calls