Refactor Wikka handler

Trello card: https://trello.com/c/xKt7rJ2l