refactor markup.images