Refactored what was there in order to eliminate static variables/functions