Refactored variables in Shop classes.