HTML indent fixes
Use $event data directly
Minor comment tweaks