Added basic sanitization