Remove code duplication in Templates
Remove redundant 'do'
Implement auto-linking of WikiWords