Rewrite star/end tags for clarity