Cleanup relay device type

Follows the existing code a bit better