refactored code to standardize assets store