Allow anonymous speaker
Cleanup/formating