Refactored yum module