Refactor for Redhat