put data lookup inside guarded block
remove redundant args