refactor equipment