Cleaned up a few areas. Started refactoring the collector.