Fixing el7.  Adding some polish