Better handling of function declaration and body.
Function calls and some clean up.