Making things a bit DRYer and easier to read.

Enyo-DCO-1.1-Signed-Off-By: Gray Norton (gray.norton@lge.com)