Remove space
Fix more XSS, cleaned up a bit
Merge pull request #41 from Southparkfan/patch-9

Clean up + xss fixes