cleanup, updates and rewrites

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@lge.com>