Addressing all redhat comments/feedback