Refactoring pollution, preparing for Pollev