refactoring system variables