+ small refctoring spam filter