Refactoring, added primitive keyword extraction from source