Added some sanitization and small formatting pickiness.