removed call to garbageCleaner
syntax cleanup (readability), re-order some code, removed garbageCleanup