Improved mirror detection+refactor+removing wikiformat earlier (before diff)