Variables refactoring