Refactoring pollution, I will finish refactoring tomorrow