riaxpander reorganization
refactored polluted 'keyword?'