refactoring of variables