Cleaned up spam-blocker