restructuring verbs function, moving outside client