inline some variables and rename the data attribute