Refactor mix