Cleanup from merge and correction to white-spaceing.

Enyo-DCO-1.1-Signed-off-by: Blake Stephens <blake.stephens@lge.com>