Refactored some of the linguistic scanning to a better place