Updated with comments from Fedora

Signed-off-by: Luis Pabon <lpabon@redhat.com>