Made unnecessary static variables no longer static