wiki: refactoring