Mayor style cleanup and loose closing tag fix