some clean up, this needs one more iteration

Signed-off-by: Daniel Nakhla <dn@ammirati.com>