Updated to more refactorings - use singleton instances of token
extractor, remove commented out code etc