Cleaned up and made producers more streamlined