refactoring storage class