some refactoring and changes for moving from RHEL to Fedora