Some code clean ups

Moderation filtering changed