SystemExit added
Adding support for local variables
Code clean up