Markup cleanup and use _.random()