Code cleanup for Spam.php
Merge branch 'dstockto-spam_cleanup'