Refactor YagoAnswerer