Split to collector class and now uses Redis. Random cleanup.
Split to collector class and now uses Redis. Random cleanup.