Reformat to project standard
Tidying
Fix buffer overrun in spam= acl condition.  Bug 1552