Fixing return statement
Variable and function calls, still need to fix function arguments though