Deleted old functions
Improved output of variables