refactored code to be a little less complex, improved regex to match more plural forms