Refactor equipment method