refactoring variable storage