BBCode spelling
Refactor avatar code