There are also some minor cosmetic tweaks to the files.

Signed-off-by: Paul Moore <pmoore@redhat.com>