Removed global variables pollution