Refactored some inventory