Cleanup + some work on implementing user defined functions and variables