Cosmetics and removed XSS (barf, loser !)