Fix review comments

Reviewed code from Alex Balaschenko, and instead of making an email
about it, I'm just fixing it up myself directly.

Enyo-DCO-1.1-Signed-Off-By: Edwin Hoogerbeets (edwin.hoogerbeets@lge.com)