refactorization
Bug with plural verbs fixed