refacter markup.variables