Tweak for clean markup