Fixed global variables simple cleanup