Refactoring of markup. <Ben>