Refactor some parts in Markup processor