Refactor usage of variables