Fix indentation and rogue tags