refactored genres