global variables removed
cleaned