Flip device email logic for readability
Merge pull request #379 from tlvince/refactor/device-info-readability

Flip device email logic for readability