refactor instant markup