Get rid of static variables in functions
2 files changed