Refactor moderation