better organization of mentions detection