Refactored and extracted wiki parts