I know this isn't new code but I would move the creation of the Content object BELOW the if(enableEnvironmentFiltering) block. Because if the ```continue;``` is triggered we wasted the creation of an object for no reason.  Actually move the ```new Content``` just above where we set the id on content for the first time.