Refactored empty device