Refactored device