Misc. small clean-up

Signed-off-by: Tony Asleson <tasleson@redhat.com>