Refactor Kompleter module