Refactored yum