refactoring abusecfinder