Refactor static variables into a structure