Code cleanup for Spam.php