Refactor actuator