Cleaned up mixing operation