Address minor code smells in Device internals