Refactor of inline variables, used data instead of ID