Cleaned up code
Added ExtractorServiceTest