Working on sanitize function a bit