Cleanups and tweaks

Signed-off-by: Andrew Jones <drjones@redhat.com>