Refactored for readability

Added inventory to system